merge
authorIan Campbell <ian.campbell@xensource.com>
Tue, 3 Jul 2007 09:31:13 +0000 (10:31 +0100)
committerIan Campbell <ian.campbell@xensource.com>
Tue, 3 Jul 2007 09:31:13 +0000 (10:31 +0100)

Trivial merge